Resolve merge conflicts#16
Merged
jhoward-lm merged 4 commits intoJul 25, 2025
Merged
Conversation
Signed-off-by: nscuro <[email protected]>
…to normalize-permission-model-merge-fix
Signed-off-by: nscuro <[email protected]>
5 tasks
jhoward-lm
approved these changes
Jul 25, 2025
jhoward-lm
merged commit f21cc84
into
jhoward-lm:normalize-permission-model
1 check failed
lmphil
pushed a commit
to lmphil/hyades-apiserver
that referenced
this pull request
Jul 30, 2025
…RL (jhoward-lm#16) Signed-off-by: Emmanuel Meremikwu <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Resolves the merge conflicts caused by DependencyTrack#1296 and adds a missing unique index.
Addressed Issue
DependencyTrack#1207
Additional Details
N/A
Checklist
This PR fixes a defect, and I have provided tests to verify that the fix is effectiveThis PR implements an enhancement, and I have provided tests to verify that it works as intendedThis PR introduces new or alters existing behavior, and I have updated the documentation accordingly